From 1f7d7453b1a1f5cc7f7e03f2e44105a5e49815a5 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 1 Dec 2000 04:05:47 +0000 Subject: [PATCH] Properly handle gc->clip_region == NULL> Thu Nov 30 23:03:04 2000 Owen Taylor * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle gc->clip_region == NULL> --- ChangeLog | 7 ++++++- ChangeLog.pre-2-0 | 7 ++++++- ChangeLog.pre-2-10 | 7 ++++++- ChangeLog.pre-2-2 | 7 ++++++- ChangeLog.pre-2-4 | 7 ++++++- ChangeLog.pre-2-6 | 7 ++++++- ChangeLog.pre-2-8 | 7 ++++++- gdk/x11/gdkgc-x11.c | 5 ++++- 8 files changed, 46 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 496daace73..16a0cc3094 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 30 23:03:04 2000 Owen Taylor + + * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle + gc->clip_region == NULL> + 2000-11-30 Tor Lillqvist Changes by Hans Breuer: @@ -6157,7 +6162,7 @@ Wed Jan 26 19:01:56 2000 Owen Taylor - completion on files in home directory didn't work - completion on an empty string caused segfault - (Bug #3768, reported by Steve Ratcliffe) + (Bug #3678, reported by Steve Ratcliffe) * gtk/gtkscale.c (gtk_scale_get_value_width): Fix cut and paste error that was causing scales to diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 496daace73..16a0cc3094 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Thu Nov 30 23:03:04 2000 Owen Taylor + + * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle + gc->clip_region == NULL> + 2000-11-30 Tor Lillqvist Changes by Hans Breuer: @@ -6157,7 +6162,7 @@ Wed Jan 26 19:01:56 2000 Owen Taylor - completion on files in home directory didn't work - completion on an empty string caused segfault - (Bug #3768, reported by Steve Ratcliffe) + (Bug #3678, reported by Steve Ratcliffe) * gtk/gtkscale.c (gtk_scale_get_value_width): Fix cut and paste error that was causing scales to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 496daace73..16a0cc3094 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Nov 30 23:03:04 2000 Owen Taylor + + * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle + gc->clip_region == NULL> + 2000-11-30 Tor Lillqvist Changes by Hans Breuer: @@ -6157,7 +6162,7 @@ Wed Jan 26 19:01:56 2000 Owen Taylor - completion on files in home directory didn't work - completion on an empty string caused segfault - (Bug #3768, reported by Steve Ratcliffe) + (Bug #3678, reported by Steve Ratcliffe) * gtk/gtkscale.c (gtk_scale_get_value_width): Fix cut and paste error that was causing scales to diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 496daace73..16a0cc3094 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Thu Nov 30 23:03:04 2000 Owen Taylor + + * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle + gc->clip_region == NULL> + 2000-11-30 Tor Lillqvist Changes by Hans Breuer: @@ -6157,7 +6162,7 @@ Wed Jan 26 19:01:56 2000 Owen Taylor - completion on files in home directory didn't work - completion on an empty string caused segfault - (Bug #3768, reported by Steve Ratcliffe) + (Bug #3678, reported by Steve Ratcliffe) * gtk/gtkscale.c (gtk_scale_get_value_width): Fix cut and paste error that was causing scales to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 496daace73..16a0cc3094 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Nov 30 23:03:04 2000 Owen Taylor + + * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle + gc->clip_region == NULL> + 2000-11-30 Tor Lillqvist Changes by Hans Breuer: @@ -6157,7 +6162,7 @@ Wed Jan 26 19:01:56 2000 Owen Taylor - completion on files in home directory didn't work - completion on an empty string caused segfault - (Bug #3768, reported by Steve Ratcliffe) + (Bug #3678, reported by Steve Ratcliffe) * gtk/gtkscale.c (gtk_scale_get_value_width): Fix cut and paste error that was causing scales to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 496daace73..16a0cc3094 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Nov 30 23:03:04 2000 Owen Taylor + + * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle + gc->clip_region == NULL> + 2000-11-30 Tor Lillqvist Changes by Hans Breuer: @@ -6157,7 +6162,7 @@ Wed Jan 26 19:01:56 2000 Owen Taylor - completion on files in home directory didn't work - completion on an empty string caused segfault - (Bug #3768, reported by Steve Ratcliffe) + (Bug #3678, reported by Steve Ratcliffe) * gtk/gtkscale.c (gtk_scale_get_value_width): Fix cut and paste error that was causing scales to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 496daace73..16a0cc3094 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Nov 30 23:03:04 2000 Owen Taylor + + * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle + gc->clip_region == NULL> + 2000-11-30 Tor Lillqvist Changes by Hans Breuer: @@ -6157,7 +6162,7 @@ Wed Jan 26 19:01:56 2000 Owen Taylor - completion on files in home directory didn't work - completion on an empty string caused segfault - (Bug #3768, reported by Steve Ratcliffe) + (Bug #3678, reported by Steve Ratcliffe) * gtk/gtkscale.c (gtk_scale_get_value_width): Fix cut and paste error that was causing scales to diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c index 0f78a853e3..ad3dc65caa 100644 --- a/gdk/x11/gdkgc-x11.c +++ b/gdk/x11/gdkgc-x11.c @@ -711,7 +711,10 @@ gdk_gc_copy (GdkGC *dst_gc, GdkGC *src_gc) if (x11_dst_gc->clip_region) gdk_region_destroy (x11_dst_gc->clip_region); - x11_dst_gc->clip_region = gdk_region_copy (x11_src_gc->clip_region); + if (x11_src_gc->clip_region) + x11_dst_gc->clip_region = gdk_region_copy (x11_src_gc->clip_region); + else + x11_dst_gc->clip_region = NULL; x11_dst_gc->dirty_mask = x11_src_gc->dirty_mask; } -- 2.30.2